package com.znf4.controller.trade;
/*package com.znf4.platform.controller.trade;

import java.util.HashMap;
import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;

import com.znf4.platform.account.service.RpAccountService;
import com.znf4.platform.bank.enums.BankSettTypeEnum;
import com.znf4.platform.bank.enums.BankWayEnum;
import com.znf4.platform.banklink.vo.CnpPayQueryParam;
import com.znf4.platform.banklink.vo.CnpPayQueryResult;
import com.znf4.platform.banklink.weixin.BankCnpPayService;
import com.znf4.platform.common.core.dwz.DWZ;
import com.znf4.platform.common.core.dwz.DwzAjax;
import com.znf4.platform.common.core.enums.BankLaunchTypeEnum;
import com.znf4.platform.common.core.enums.PayTypeEnum;
import com.znf4.platform.common.core.enums.PayWayEnum;
import com.znf4.platform.common.core.page.PageBean;
import com.znf4.platform.common.core.page.PageParam;
import com.znf4.platform.common.core.utils.DateUtils;
import com.znf4.platform.trade.entity.RpTradePaymentRecord;
import com.znf4.platform.trade.enums.TradeSettStatus;
import com.znf4.platform.trade.enums.TradeStatusEnum;
import com.znf4.platform.trade.enums.TrxTypeEnum;
import com.znf4.platform.trade.service.RpTradePaymentManagerService;
import com.znf4.platform.trade.service.RpTradePaymentQueryService;
import com.znf4.platform.trade.vo.PaymentOrderQueryParam;
import com.znf4.platform.user.enums.FundInfoTypeEnum;

*//**
 * 交易管理 
 *//*
@Controller
@RequestMapping("/trade")
public class TradeController {

	@Autowired
	private RpTradePaymentQueryService rpTradePaymentQueryService;
	
	@Autowired
	private RpTradePaymentManagerService rpTradePaymentManagerService;
	
	@Autowired
	private BankCnpPayService bankCnpPayService;
	
	@Autowired
	private RpAccountService rpAccountService;

	@RequiresPermissions("trade:order:view")
	@RequestMapping(value = "/listPaymentOrder", method = { RequestMethod.POST, RequestMethod.GET })
	public String listPaymentOrder(HttpServletRequest request, PaymentOrderQueryParam paymentOrderQueryParam, PageParam pageParam, Model model) throws Exception {
		
		// 如果不带时间条件查询，默认查当天的成功交易（因为不带条件查询会导致查询数据量过大而影响系统性能）
		if (StringUtils.isBlank(paymentOrderQueryParam.getOrderDateBegin())
			&& StringUtils.isBlank(paymentOrderQueryParam.getOrderDateEnd())){
			
			String nowDateStr = DateUtils.today(); // 当前日期 yyyy-MM-dd
			
			String orderDateBegin = nowDateStr + " 00:00:00";
			paymentOrderQueryParam.setOrderDateBegin(orderDateBegin);
			
			String orderDateEnd = nowDateStr + " 23:59:59";
			paymentOrderQueryParam.setOrderDateEnd(orderDateEnd);
		}
		
		
		PageBean pageBean = rpTradePaymentQueryService.listPaymentOrderPage(pageParam, paymentOrderQueryParam);
		model.addAttribute("pageBean", pageBean);
		model.addAttribute("pageParam", pageParam);
		model.addAttribute("paymentOrderQueryParam", paymentOrderQueryParam);// 查询条件

		model.addAttribute("statusEnums", TradeStatusEnum.toMap());// 状态
		model.addAttribute("payWayNameEnums", PayWayEnum.toMap());// 支付方式
		model.addAttribute("payTypeNameEnums", PayTypeEnum.toMap());// 支付类型
		model.addAttribute("fundIntoTypeEnums", FundInfoTypeEnum.toMap());// 支付类型
		
		model.addAttribute("bankWayEnums", BankWayEnum.toMap());
		model.addAttribute("bankSettTypeEnums", BankSettTypeEnum.toMap());
		
		return "trade/listPaymentOrder";
	}

	@RequiresPermissions("trade:record:view")
	@RequestMapping(value = "/listPaymentRecord", method = { RequestMethod.POST, RequestMethod.GET })
	public String listPaymentRecord(HttpServletRequest request, PaymentOrderQueryParam paymentOrderQueryParam, PageParam pageParam, Model model) throws Exception {
		
		*//*********************************修改部分*********************************//*
		String merchantNo = request.getParameter("merchant.userNo");
		paymentOrderQueryParam.setMerchantNo(merchantNo);
		*//*********************************修改部分*********************************//*
		
		// 如果不带时间条件查询，默认查当天的成功交易（因为不带条件查询会导致查询数据量过大而影响系统性能）
		if (StringUtils.isBlank(paymentOrderQueryParam.getOrderDateBegin())
			&& StringUtils.isBlank(paymentOrderQueryParam.getOrderDateEnd())
			&& StringUtils.isBlank(paymentOrderQueryParam.getPayTimeBegin())
			&& StringUtils.isBlank(paymentOrderQueryParam.getPayTimeEnd())){
			
			String nowDateStr = DateUtils.today(); // 当前日期 yyyy-MM-dd
			
			String orderDateBegin = nowDateStr + " 00:00:00";
			paymentOrderQueryParam.setOrderDateBegin(orderDateBegin);
			
			String orderDateEnd = nowDateStr + " 23:59:59";
			paymentOrderQueryParam.setOrderDateEnd(orderDateEnd);
		}
		
		PageBean pageBean = rpTradePaymentQueryService.listPaymentRecordPage(pageParam, paymentOrderQueryParam);
		model.addAttribute("pageBean", pageBean);
		model.addAttribute("countResultMap", pageBean.getCountResultMap());
		model.addAttribute("pageParam", pageParam);
		model.addAttribute("paymentOrderQueryParam", paymentOrderQueryParam);

		model.addAttribute("statusEnums", TradeStatusEnum.toMap());// 状态
		model.addAttribute("tradeSettStatusEnums", TradeSettStatus.toMap());// 结算状态
		model.addAttribute("payWayNameEnums", PayWayEnum.toMap());// 支付方式
		model.addAttribute("payTypeNameEnums", PayTypeEnum.toMap());// 支付类型
		model.addAttribute("fundIntoTypeEnums", FundInfoTypeEnum.toMap());// 支付类型
		model.addAttribute("trxTypeEnums", TrxTypeEnum.toMap());// 支付类型
		
		model.addAttribute("bankWayEnums", BankWayEnum.toMap());
		model.addAttribute("bankSettTypeEnums", BankSettTypeEnum.toMap());
		
		*//*********************************修改部分*********************************//*
		Map<String, Object> paramMap = new HashMap<String, Object>();
		paramMap.put("merchantNo", paymentOrderQueryParam.getMerchantNo());// 商户编号
		paramMap.put("merchantName", paymentOrderQueryParam.getMerchantName());// 商户名称
		paramMap.put("merchantOrderNo", paymentOrderQueryParam.getMerchantOrderNo());// 商户订单号
		paramMap.put("fundIntoType", paymentOrderQueryParam.getFundIntoType());// 资金流入类型
		paramMap.put("payTypeName", paymentOrderQueryParam.getPayTypeName());// 支付类型
		paramMap.put("payWayName", paymentOrderQueryParam.getPayWayName());// 支付类型
		paramMap.put("status", paymentOrderQueryParam.getStatus());// 支付状态
		paramMap.put("moreStatus", paymentOrderQueryParam.getMoreStatus());// 支付状态
		paramMap.put("bankOrderNo", paymentOrderQueryParam.getBankOrderNo());// 银行订单号
		paramMap.put("trxNo", paymentOrderQueryParam.getTrxNo());// 交易流水号
		paramMap.put("settStatus", paymentOrderQueryParam.getSettStatus());// 交易流水号
		paramMap.put("beginDate", paymentOrderQueryParam.getBeginDate());
		paramMap.put("endDate", paymentOrderQueryParam.getEndDate());
		paramMap.put("trxType", paymentOrderQueryParam.getTrxType());
		paramMap.put("settMerchantNo", paymentOrderQueryParam.getSettMerchantNo());
		
		paramMap.put("bankWayCode",paymentOrderQueryParam.getBankWayName());
		paramMap.put("settType",paymentOrderQueryParam.getSettType());
		
		
		if (paymentOrderQueryParam.getOrderDateBegin() != null) {
			paramMap.put("orderDateBegin", paymentOrderQueryParam.getOrderDateBegin());// 支付状态
		}

		if (paymentOrderQueryParam.getOrderDateEnd() != null) {
			paramMap.put("orderDateEnd", paymentOrderQueryParam.getOrderDateEnd());// 支付状态
		}

		// 支付时间
		if (paymentOrderQueryParam.getPayTimeBegin() != null) {
			paramMap.put("payTimeBegin", paymentOrderQueryParam.getPayTimeBegin());
		}
		if (paymentOrderQueryParam.getPayTimeEnd() != null) {
			paramMap.put("payTimeEnd", paymentOrderQueryParam.getPayTimeEnd());
		}
		
		model.addAttribute("countResultMap", rpTradePaymentQueryService.getPaymentRecordCountResultMap(paramMap));
		*//*********************************修改部分*********************************//*
		
		
		return "trade/listPaymentRecord";
	}
	
	*//**
	 * 支付记录统计
	 * @param request
	 * @param paymentOrderQueryParam
	 * @param pageParam
	 * @param model
	 * @return
	 *//*
	@RequiresPermissions("trade:record:view")
	@RequestMapping(value = "/listPaymentRecord_count", method = { RequestMethod.POST, RequestMethod.GET })
	public String listPaymentRecord_count(HttpServletRequest request, PaymentOrderQueryParam paymentOrderQueryParam, PageParam pageParam, Model model) {
		
		
		// 如果不带时间条件查询，默认查当天的成功交易（因为不带条件查询会导致查询数据量过大而影响系统性能）
		if (StringUtils.isBlank(paymentOrderQueryParam.getOrderDateBegin())
			&& StringUtils.isBlank(paymentOrderQueryParam.getOrderDateEnd())
			&& StringUtils.isBlank(paymentOrderQueryParam.getPayTimeBegin())
			&& StringUtils.isBlank(paymentOrderQueryParam.getPayTimeEnd())){
			
			String nowDateStr = DateUtils.today(); // 当前日期 yyyy-MM-dd
			
			String orderDateBegin = nowDateStr + " 00:00:00";
			paymentOrderQueryParam.setOrderDateBegin(orderDateBegin);
			
			String orderDateEnd = nowDateStr + " 23:59:59";
			paymentOrderQueryParam.setOrderDateEnd(orderDateEnd);
			
			paymentOrderQueryParam.setStatus(TradeStatusEnum.SUCCESS.name()); // 默认选择成功状态
		}
		
		Map<String, Object> paramMap = new HashMap<String, Object>();
		paramMap.put("merchantNo", paymentOrderQueryParam.getMerchantNo());// 商户编号
		paramMap.put("merchantName", paymentOrderQueryParam.getMerchantName());// 商户名称
		paramMap.put("merchantOrderNo", paymentOrderQueryParam.getMerchantOrderNo());// 商户订单号
		paramMap.put("fundIntoType", paymentOrderQueryParam.getFundIntoType());// 资金流入类型
		paramMap.put("payTypeName", paymentOrderQueryParam.getPayTypeName());// 支付类型
		paramMap.put("payWayName", paymentOrderQueryParam.getPayWayName());// 支付类型
		paramMap.put("status", paymentOrderQueryParam.getStatus());// 支付状态
		paramMap.put("moreStatus", paymentOrderQueryParam.getMoreStatus());// 支付状态
		paramMap.put("bankOrderNo", paymentOrderQueryParam.getBankOrderNo());// 银行订单号
		paramMap.put("trxNo", paymentOrderQueryParam.getTrxNo());// 交易流水号
		paramMap.put("settStatus", paymentOrderQueryParam.getSettStatus());// 交易流水号
		paramMap.put("beginDate", paymentOrderQueryParam.getBeginDate());
		paramMap.put("endDate", paymentOrderQueryParam.getEndDate());
		paramMap.put("trxType", paymentOrderQueryParam.getTrxType());
		paramMap.put("settMerchantNo", paymentOrderQueryParam.getSettMerchantNo());
		
		if (paymentOrderQueryParam.getOrderDateBegin() != null) {
			paramMap.put("orderDateBegin", paymentOrderQueryParam.getOrderDateBegin());// 支付状态
		}

		if (paymentOrderQueryParam.getOrderDateEnd() != null) {
			paramMap.put("orderDateEnd", paymentOrderQueryParam.getOrderDateEnd());// 支付状态
		}

		// 支付时间
		if (paymentOrderQueryParam.getPayTimeBegin() != null) {
			paramMap.put("payTimeBegin", paymentOrderQueryParam.getPayTimeBegin());
		}
		if (paymentOrderQueryParam.getPayTimeEnd() != null) {
			paramMap.put("payTimeEnd", paymentOrderQueryParam.getPayTimeEnd());
		}
		
		model.addAttribute("countResultMap", rpTradePaymentQueryService.getPaymentRecordCountResultMap(paramMap));
		model.addAttribute("pageParam", pageParam);
		model.addAttribute("paymentOrderQueryParam", paymentOrderQueryParam);

		model.addAttribute("statusEnums", TradeStatusEnum.toMap());// 状态
		model.addAttribute("tradeSettStatusEnums", TradeSettStatus.toMap());// 结算状态
		model.addAttribute("payWayNameEnums", PayWayEnum.toMap());// 支付方式
		model.addAttribute("payTypeNameEnums", PayTypeEnum.toMap());// 支付类型
		model.addAttribute("fundIntoTypeEnums", FundInfoTypeEnum.toMap());// 支付类型
		model.addAttribute("trxTypeEnums", TrxTypeEnum.toMap());// 支付类型
		return "trade/listPaymentRecord_count";
	}

	@RequiresPermissions("trade:record:view")
	@RequestMapping(value = "/recordNotify/{merchantNo}/{merchantOrderNo}/{bankOrderNo}/{status}", method = { RequestMethod.POST, RequestMethod.GET })
	public String recordNotify(@PathVariable("merchantNo") String  merchantNo , @PathVariable("merchantOrderNo") String  merchantOrderNo, @PathVariable("bankOrderNo")String bankOrderNo, @PathVariable("status")String status, DwzAjax dwz, Model model) {
		if(!(status.equals(TradeStatusEnum.SUCCESS.name())||status.equals(TradeStatusEnum.FINISH.name()))){
			RpTradePaymentRecord rpTradePaymentRecord = rpTradePaymentQueryService.getRecordByBankOrderNo(bankOrderNo);
			CnpPayQueryParam cnpPayQueryParam = new CnpPayQueryParam();
			cnpPayQueryParam.setBankChannelCode(rpTradePaymentRecord.getBankChannelCode());
			cnpPayQueryParam.setBankTrxNo(rpTradePaymentRecord.getBankTrxNo());
			cnpPayQueryParam.setBankOrderNo(bankOrderNo);
			cnpPayQueryParam.setOrderDate(rpTradePaymentRecord.getCreateTime());
			CnpPayQueryResult result = bankCnpPayService.cnpPayQuery(cnpPayQueryParam);
			if(result.getTradeStatusEnum().name().equals(TradeStatusEnum.SUCCESS.name())){
				String remitRequestNo = rpAccountService.buildRemitRequestNo();
				rpTradePaymentManagerService.completePayTrade(rpTradePaymentRecord.getBankChannelCode(), rpTradePaymentRecord.getBankOrderNo(), rpTradePaymentRecord.getBankTrxNo(), rpTradePaymentRecord.getOrderAmount(), result.getBankSuccessTime(), result.getTradeStatusEnum(), "", false, TradeSettStatus.NOT_COMPLETE_SETT.name(), remitRequestNo);
			}else if(result.getTradeStatusEnum().name().equals(TradeStatusEnum.FINISH.name())){
				String remitRequestNo = rpAccountService.buildRemitRequestNo();
				rpTradePaymentManagerService.completePayTrade(rpTradePaymentRecord.getBankChannelCode(), rpTradePaymentRecord.getBankOrderNo(), rpTradePaymentRecord.getBankTrxNo(), rpTradePaymentRecord.getOrderAmount(), result.getBankSuccessTime(), result.getTradeStatusEnum(), "", true, TradeSettStatus.COMPLETE_SETT.name(), remitRequestNo);
			}
		}
		rpTradePaymentQueryService.merchantOrderNotify(merchantNo,merchantOrderNo);
		dwz.setStatusCode(DWZ.SUCCESS);
		dwz.setMessage(DWZ.SUCCESS_MSG);
		model.addAttribute("dwz", dwz);
		return DWZ.AJAX_DONE;
	}
	
	*//**
	 * 异步统计
	 * @param request
	 * @return
	 *//*
	@RequestMapping(value = "/sumAmountTrade", method ={RequestMethod.POST,RequestMethod.GET})     
    @ResponseBody
    public Map sumAmountTrade(HttpServletRequest request){
		String merchantNo = request.getParameter("merchantNo");
		String merchantOrderNo = request.getParameter("merchantOrderNo");
		String bankOrderNo = request.getParameter("bankOrderNo");
		String trxNo = request.getParameter("trxNo");
		String recordDateBegin = request.getParameter("recordDateBegin");
		String recordDateEnd = request.getParameter("recordDateEnd");
		String payTimeBegin = request.getParameter("payTimeBegin");
		String payTimeEnd = request.getParameter("payTimeEnd");
		String status = request.getParameter("status");
		String payWayName = request.getParameter("payWayName");
		String payTypeName = request.getParameter("payTypeName");
		String settStatus = request.getParameter("settStatus");
		
		// 如果不带时间条件查询，默认查当天的成功交易（因为不带条件查询会导致查询数据量过大而影响系统性能）
		if (StringUtils.isBlank(recordDateBegin)
			&& StringUtils.isBlank(recordDateEnd)
			&& StringUtils.isBlank(payTimeBegin)
			&& StringUtils.isBlank(payTimeEnd)){
					
			String nowDateStr = DateUtils.today(); // 当前日期 yyyy-MM-dd
					
			String orderDateBegin = nowDateStr + " 00:00:00";
			recordDateBegin = orderDateBegin;
					
			String orderDateEnd = nowDateStr + " 23:59:59";
			recordDateEnd = orderDateEnd;
		}
		
		Map<String, Object> paramMap = new HashMap<String, Object>();
		paramMap.put("merchantNo", merchantNo);// 商户编号
		paramMap.put("merchantOrderNo", merchantOrderNo);// 商户订单号
		paramMap.put("bankOrderNo", bankOrderNo);// 银行订单号
		paramMap.put("trxNo", trxNo);// 交易流水号
		if (recordDateBegin != null) {
			paramMap.put("orderDateBegin", recordDateBegin);
		}
		if (recordDateEnd != null) {
			paramMap.put("orderDateEnd", recordDateEnd);
		}
		if (payTimeBegin != null) {
			paramMap.put("payTimeBegin", payTimeBegin);
		}
		if (payTimeEnd != null) {
			paramMap.put("payTimeEnd", payTimeBegin);
		}
		paramMap.put("status", status);// 支付状态
		paramMap.put("payWayName", payWayName);// 支付类型
		paramMap.put("payTypeName", payTypeName);// 支付类型
		paramMap.put("settStatus", settStatus);// 交易流水号
		return rpTradePaymentQueryService.getPaymentRecordCountResultMap(paramMap);
    } 
	
	*//******************************************************************修改部分0601******************************************************************//*
	*//**
	 * 代理商户交易记录
	 * @param request
	 * @param paymentOrderQueryParam
	 * @param pageParam
	 * @param model
	 * @return
	 * @throws Exception
	 *//*
	@RequiresPermissions("trade:record:view")
	@RequestMapping(value = "/listAgentMerchantPaymentRecord", method = { RequestMethod.POST, RequestMethod.GET })
	public String listAgentMerchantPaymentRecord(HttpServletRequest request, PaymentOrderQueryParam paymentOrderQueryParam, PageParam pageParam, Model model) throws Exception {
		
		*//*********************************修改部分*********************************//*
		String organizateNo = request.getParameter("agent.userNo");
		paymentOrderQueryParam.setOrganizateNo(organizateNo);
		*//*********************************修改部分*********************************//*
		
		// 如果不带时间条件查询，默认查当天的成功交易（因为不带条件查询会导致查询数据量过大而影响系统性能）
		if (StringUtils.isBlank(paymentOrderQueryParam.getOrderDateBegin())
			&& StringUtils.isBlank(paymentOrderQueryParam.getOrderDateEnd())
			&& StringUtils.isBlank(paymentOrderQueryParam.getPayTimeBegin())
			&& StringUtils.isBlank(paymentOrderQueryParam.getPayTimeEnd())){
			
			String nowDateStr = DateUtils.today(); // 当前日期 yyyy-MM-dd
			
			String orderDateBegin = nowDateStr + " 00:00:00";
			paymentOrderQueryParam.setOrderDateBegin(orderDateBegin);
			
			String orderDateEnd = nowDateStr + " 23:59:59";
			paymentOrderQueryParam.setOrderDateEnd(orderDateEnd);
		}
		
		PageBean pageBean = rpTradePaymentQueryService.listPaymentRecordPage(pageParam, paymentOrderQueryParam);
		model.addAttribute("pageBean", pageBean);
		model.addAttribute("countResultMap", pageBean.getCountResultMap());
		model.addAttribute("pageParam", pageParam);
		model.addAttribute("paymentOrderQueryParam", paymentOrderQueryParam);

		model.addAttribute("statusEnums", TradeStatusEnum.toMap());// 状态
		model.addAttribute("tradeSettStatusEnums", TradeSettStatus.toMap());// 结算状态
		model.addAttribute("payWayNameEnums", PayWayEnum.toMap());// 支付方式
		model.addAttribute("payTypeNameEnums", PayTypeEnum.toMap());// 支付类型
		model.addAttribute("fundIntoTypeEnums", FundInfoTypeEnum.toMap());// 支付类型
		model.addAttribute("trxTypeEnums", TrxTypeEnum.toMap());// 支付类型
		
		
		
		*//*********************************修改部分*********************************//*
		Map<String, Object> paramMap = new HashMap<String, Object>();
//		paramMap.put("merchantNo", paymentOrderQueryParam.getMerchantNo());// 商户编号
		paramMap.put("organizationNo", paymentOrderQueryParam.getOrganizateNo());
		paramMap.put("merchantName", paymentOrderQueryParam.getMerchantName());// 商户名称
		paramMap.put("merchantOrderNo", paymentOrderQueryParam.getMerchantOrderNo());// 商户订单号
		paramMap.put("fundIntoType", paymentOrderQueryParam.getFundIntoType());// 资金流入类型
		paramMap.put("payTypeName", paymentOrderQueryParam.getPayTypeName());// 支付类型
		paramMap.put("payWayName", paymentOrderQueryParam.getPayWayName());// 支付类型
		paramMap.put("status", paymentOrderQueryParam.getStatus());// 支付状态
		paramMap.put("moreStatus", paymentOrderQueryParam.getMoreStatus());// 支付状态
		paramMap.put("bankOrderNo", paymentOrderQueryParam.getBankOrderNo());// 银行订单号
		paramMap.put("trxNo", paymentOrderQueryParam.getTrxNo());// 交易流水号
		paramMap.put("settStatus", paymentOrderQueryParam.getSettStatus());// 交易流水号
		paramMap.put("beginDate", paymentOrderQueryParam.getBeginDate());
		paramMap.put("endDate", paymentOrderQueryParam.getEndDate());
		paramMap.put("trxType", paymentOrderQueryParam.getTrxType());
		paramMap.put("settMerchantNo", paymentOrderQueryParam.getSettMerchantNo());
		
		if (paymentOrderQueryParam.getOrderDateBegin() != null) {
			paramMap.put("orderDateBegin", paymentOrderQueryParam.getOrderDateBegin());// 支付状态
		}

		if (paymentOrderQueryParam.getOrderDateEnd() != null) {
			paramMap.put("orderDateEnd", paymentOrderQueryParam.getOrderDateEnd());// 支付状态
		}

		// 支付时间
		if (paymentOrderQueryParam.getPayTimeBegin() != null) {
			paramMap.put("payTimeBegin", paymentOrderQueryParam.getPayTimeBegin());
		}
		if (paymentOrderQueryParam.getPayTimeEnd() != null) {
			paramMap.put("payTimeEnd", paymentOrderQueryParam.getPayTimeEnd());
		}
		
		model.addAttribute("countResultMap", rpTradePaymentQueryService.getPaymentRecordCountResultMap(paramMap));
		*//*********************************修改部分*********************************//*
		
		return "trade/listAgentMerchantPaymentRecord";
	}
	*//******************************************************************修改部分0601******************************************************************//*	

}
*/